Fixes to build Focal-compatible image for Volla Phone 22
These changes make it possible to build Focal-compatible image for Volla Phone 22. Actually, these 3 2 commits have little in common, but splitting them would complicate testing so I submitted them together.
Edited by Ratchanan Srirattanamet