fix framworks/base after 4.2.2 merge

PS2: remove packages/SystemUI/res/layout-sw600dp/navigation_bar.xml
PS3: javadoc error fix

Change-Id: Id42cb699d25b26e89e682966b70f19e338eef44c
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Merge remote-tracking branch 'aokp/jb-mr1' into jb-mr1