Merge "Fix potential crash in libandroidfw"