Merge "Remove hiddenapi access flags in FixedUpDexFile" am: 9690ad794b
am: af2de4dc71

Change-Id: Ib389fa6512a952a84ec3f22244490a64590961eb